From f3a10035d467605ee65cb6b491721c6b01391993 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 20 Sep 2006 09:56:50 +0100 Subject: [PATCH] [XEN] Fix arg clobber test for debug version of hypercall code. Signed-off-by: Jan Beulich Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/entry.S | 2 +- xen/arch/x86/x86_64/entry.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 79f0f08815..06a25fa188 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -198,7 +198,7 @@ ENTRY(hypercall) /* Deliberately corrupt parameter regs used by this hypercall. */ addl $24,%esp # Shadow parameters popl %ecx # Shadow EIP - cmpl %ecx,UREGS_eip(%esp) + cmpl %ecx,UREGS_eip+4(%esp) popl %ecx # Shadow hypercall index jne skip_clobber # If EIP has changed then don't clobber movzb hypercall_args_table(,%ecx,1),%ecx diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index d1a6c19599..57a3674eda 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -152,7 +152,7 @@ ENTRY(syscall_enter) #ifndef NDEBUG /* Deliberately corrupt parameter regs used by this hypercall. */ popq %r10 # Shadow RIP - cmpq %r10,UREGS_rip(%rsp) + cmpq %r10,UREGS_rip+8(%rsp) popq %rcx # Shadow hypercall index jne skip_clobber /* If RIP has changed then don't clobber. */ leaq hypercall_args_table(%rip),%r10 -- 2.30.2